fix: resolve issue with batching MRs and forked MRs (#302) #322
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
qqshfox
reviewed
Oct 7, 2021
| # delay in case Gitlab is slow to respond | ||
| waiting_time_in_secs = 20 | ||
| log.debug('Waiting for %s secs for MR !%s to get status update', waiting_time_in_secs, batch_mr.iid) | ||
| time.sleep(waiting_time_in_secs) |
There was a problem hiding this comment.
Waiting for 20 seconds to get status update seems brutal. Would it be better to have a function to poll the status and have an interval and a limit? It can be used for other sleeps as well.
Since all forked MRs are prepared to local branches, the MR acceptance procedure needs to be also local. * fix batching MRs when source branch has different repo url * fix unit tests * add unit test for use case forked MRs * remove credentials from debug log Changes: /tmpiq7raaob/tmpb84bjxf0 # git merge origin/dummy21 --ff --ff-only merge: origin/dummy21 - not something we can merge Into: /tmpiq7raaob/tmpb84bjxf0 # git merge dummy21 --ff --ff-only Updating b51f541..9525b89 Fast-forward 21 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 21 Signed-off-by: Sascha Binckly <[email protected]>
sg70
force-pushed
the
issue-302-fix-batching-mrs-for-forking-workflow
branch
from
f1bb40f
to
241409d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since all forked MRs are prepared to local branches, the MR
acceptance procedure needs to be also local.
Changes:
Into:
Signed-off-by: Sascha Binckly [email protected]